From: Paul Eggert Date: Mon, 7 Feb 2011 05:47:56 +0000 (-0800) Subject: * ralloc.c: conform to C89 pointer rules X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~24 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2c7986b74f831556eefdc2f4fdc8b5767d8a46c5;p=emacs.git * ralloc.c: conform to C89 pointer rules --- diff --git a/src/ChangeLog b/src/ChangeLog index 9c4007e44c3..1199bb9eeaf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -27,6 +27,7 @@ * doprnt.c (doprnt): Likewise. * indent.c (compute_motion): Likewise. * xfont.c (xfont_decode_coding_xlfd): Likewise. + * ralloc.c (resize_bloc): Likewise. * character.c (strwidth): Make its argument const char *, not const unsigned char *, since more callers prefer it that way. All callers changed. diff --git a/src/ralloc.c b/src/ralloc.c index ee8493b89a4..9c601a0ac24 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -648,7 +648,7 @@ resize_bloc (bloc_ptr bloc, SIZE size) else { memmove (bloc->new_data, bloc->data, old_size); - memset (bloc->new_data + old_size, 0, size - old_size); + memset ((char *) bloc->new_data + old_size, 0, size - old_size); *bloc->variable = bloc->data = bloc->new_data; } } @@ -1259,4 +1259,3 @@ r_alloc_init (void) use_relocatable_buffers = 1; } -